inspector: Don't use global variable here
authorBenjamin Otte <otte@redhat.com>
Tue, 21 Jun 2022 00:30:47 +0000 (02:30 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 21 Jun 2022 00:35:02 +0000 (02:35 +0200)
When inspecting the inspector, we want to create mutiple displays here.

If we need this to be global, we should store it per-inspected-display.

gtk/inspector/window.c

index 35a90302f0985bbe72f8f7bc8af110674f1e9c07..29d079e4c1fe4a53713a5a8090b8e66d49887b32 100644 (file)
@@ -679,20 +679,16 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass)
 static GdkDisplay *
 get_inspector_display (void)
 {
-  static GdkDisplay *display = NULL;
-
-  if (display == NULL)
-    {
-      const char *name;
+  GdkDisplay *display;
+  const char *name;
 
-      name = g_getenv ("GTK_INSPECTOR_DISPLAY");
-      display = gdk_display_open (name);
+  name = g_getenv ("GTK_INSPECTOR_DISPLAY");
+  display = gdk_display_open (name);
 
-      if (display)
-        g_debug ("Using display %s for GtkInspector", name);
-      else
-        g_message ("Failed to open display %s", name);
-    }
+  if (display)
+    g_debug ("Using display %s for GtkInspector", name);
+  else
+    g_message ("Failed to open display %s", name);
 
   if (!display)
     {
@@ -706,7 +702,6 @@ get_inspector_display (void)
 
   if (display)
     {
-      const char *name;
       GdkDebugFlags flags;
 
       name = g_getenv ("GTK_INSPECTOR_RENDERER");